merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Mon, 18 Dec 2006 17:56:34 +0000 (10:56 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Mon, 18 Dec 2006 17:56:34 +0000 (10:56 -0700)

Trivial merge